diff --git a/index.html b/index.html
index 0489d4e9d..855e01227 100644
--- a/index.html
+++ b/index.html
@@ -720,13 +720,13 @@ <h2>Radio Buttons</h2>
 				<!--Block-level Radios-->
 				<div class="radio">
 					<label class="radio-custom" data-initialize="radio" id="myCustomRadio1">
-						<input class="sr-only" name="radio1" type="radio" value="">
+						<input class="sr-only" name="radio1" type="radio" value="" id="radio1">
 						<span class="radio-label">Custom radio unchecked on page load</span>
 					</label>
 				</div>
 				<div class="radio">
 					<label class="radio-custom" data-initialize="radio" id="myCustomRadio2">
-						<input checked="checked" class="checked sr-only" name="radio1" type="radio" value="">
+						<input checked="checked" class="checked sr-only" name="radio1" type="radio" value="" id="radio2">
 						<span class="radio-label">Custom radio checked on page load</span>
 					</label>
 				</div>
@@ -799,6 +799,14 @@ <h2>Radio Buttons</h2>
 					<input class="sr-only" name="radio7" type="radio" value=""> <span class="radio-label">Custom inline highlight radio</span>
 				</label>
 			</div>
+			<div class="btn-panel">
+				<button type="button" class="btn btn-default" id="btnRadioDisable">disable #myCustomRadio1</button>
+				<button type="button" class="btn btn-default" id="btnRadioEnable">enable #myCustomRadio1</button>
+				<button type="button" class="btn btn-default" id="btnRadioDestroy">destroy and append #myCustomRadio1</button>
+				<button type="button" class="btn btn-default" id="btnRadioIsChecked">is #myCustomRadio1 checked?</button>
+				<button type="button" class="btn btn-default" id="btnRadioCheck">check #myCustomRadio1</button>
+				<button type="button" class="btn btn-default" id="btnRadioUncheck">uncheck #myCustomRadio1</button>
+			</div>
 		</section>
 
 		<section id="radiobuttons-no-js">
diff --git a/index.js b/index.js
index 46b77c315..53bff3631 100644
--- a/index.js
+++ b/index.js
@@ -426,22 +426,27 @@ define(function (require) {
 
 	// sample method buttons
 	$('#btnRadioDisable').on('click', function () {
-		$('[name=radio1]').radio('disable');
+		console.log('in disable');
+		$('#myCustomRadio1').radio('disable');
 	});
 	$('#btnRadioEnable').on('click', function () {
-		$('[name=radio1]').radio('enable');
+		$('#myCustomRadio1').radio('enable');
 	});
 	$('#btnRadioDestroy').on('click', function () {
-		var $container = $('#myCustomRadio1').parents('.thin-box:first');
+		var $container = $('#myCustomRadio1').parent();
 		var markup = $('#myCustomRadio1').radio('destroy');
+		log(markup);
 		$container.append(markup);
-		$('#myRadio1').radio();
 	});
-	$('#btnRadioInlineDestroy').on('click', function () {
-		var $container = $('#myCustomInlineRadio1').parents('.thin-box:first');
-		var markup = $('#myCustomInlineRadio1').radio('destroy');
-		$container.append(markup);
-		$('#myCustomInlineRadio1').radio();
+	$('#btnRadioIsChecked').on('click', function () {
+		var checked = $('#myCustomRadio1').radio('isChecked');
+		log(checked);
+	});
+	$('#btnRadioCheck').on('click', function () {
+		$('#myCustomRadio1').radio('check');
+	});
+	$('#btnRadioUncheck').on('click', function () {
+		$('#myCustomRadio1').radio('uncheck');
 	});
 
 
diff --git a/js/radio.js b/js/radio.js
index 404ae32a9..e04eb0885 100644
--- a/js/radio.js
+++ b/js/radio.js
@@ -31,152 +31,132 @@
 	var Radio = function (element, options) {
 		this.options = $.extend({}, $.fn.radio.defaults, options);
 
-		// cache elements
-		this.$radio = $(element).is('input[type="radio"]') ? $(element) : $(element).find('input[type="radio"]:first');
-		this.$label = this.$radio.parent();
-		this.groupName = this.$radio.attr('name');
-		this.$blockWrapper = this.$label.parent('.radio');	// only used if block radio control, otherwise radio is inline
-		this.isBlockWrapped = true;	// initialized as a block radio control
-		this.$toggleContainer = null;
-
-		if (this.$blockWrapper.length === 0) {
-			this.isBlockWrapped = false;
+		if(element.tagName.toLowerCase() !== 'label') {
+			//console.log('initialize radio on the label that wraps the radio');
+			return;
 		}
 
-		var toggleSelector = this.$radio.attr('data-toggle');
-		if (toggleSelector) {
-			this.$toggleContainer = $(toggleSelector);
-		}
+		// cache elements
+		this.$label = $(element);
+		this.$radio = this.$label.find('input[type="radio"]');
+		this.groupName = this.$radio.attr('name'); // don't cache group itself since items can be added programmatically
 
-		// set default state
-		this.setState(this.$radio);
+		// determine if a toggle container is specified
+		var containerSelector = this.$radio.attr('data-toggle');
+		this.$toggleContainer = $(containerSelector);
+
+		// handle internal events
+		this.$radio.on('change', $.proxy(this.itemchecked, this));
 
-		// handle events
-		this.$radio.on('change.fu.radio', $.proxy(this.itemchecked, this));
+		// set default state
+		this.setInitialState();
 	};
 
 	Radio.prototype = {
 
 		constructor: Radio,
 
-		destroy: function () {
-			// remove any external bindings
-			// [none]
-			// empty elements to return to original markup
-			// [none]
-			// return string of markup
-			if (this.isBlockWrapped) {
-				this.$blockWrapper.remove();
-				return this.$blockWrapper[0].outerHTML;
-			}	else {
-				this.$label.remove();
-				return this.$label[0].outerHTML;
-			}
+		setInitialState: function() {
+			var $radio = this.$radio;
+			var $lbl = this.$label;
 
-		},
+			// get current state of input
+			var checked = $radio.prop('checked');
+			var disabled = $radio.prop('disabled');
 
-		setState: function ($radio) {
-			$radio = $radio || this.$radio;
+			// sync label class with input state
+			this.setCheckedState($radio, checked);
+			this.setDisabledState($radio, disabled);
+		},
 
-			var checked = $radio.is(':checked');
-			var disabled = !!$radio.prop('disabled');
+		resetGroup: function() {
+			var $radios = $('input[name="' + this.groupName + '"]');
+			$radios.each(function(index, item) {
+				var $radio = $(item);
+				var $lbl = $radio.parent();
+				var containerSelector = $radio.attr('data-toggle');
+				var $containerToggle = $(containerSelector);
 
-			this.$label.removeClass('checked');
-			if (this.isBlockWrapped) {
-				this.$blockWrapper.removeClass('checked disabled');
-			}
 
-			// set state of radio
-			if (checked === true) {
-				this.$label.addClass('checked');
-				if (this.isBlockWrapped) {
-					this.$blockWrapper.addClass('checked');
-				}
+				$lbl.removeClass('checked');
+				$containerToggle.addClass('hidden');
+			});
+		},
 
-			}
+		setCheckedState: function(element, checked) {
+			// reset all items in group
+			this.resetGroup();
 
-			if (disabled === true) {
-				this.$label.addClass('disabled');
-				if (this.isBlockWrapped) {
-					this.$blockWrapper.addClass('disabled');
-				}
+			var $radio = element;
+			var $lbl = $radio.parent();
+			var containerSelector = $radio.attr('data-toggle');
+			var $containerToggle = $(containerSelector);
 
+			if(checked) {
+				$radio.prop('checked', true);
+				$lbl.addClass('checked');
+				$containerToggle.removeClass('hide hidden');
+				$lbl.trigger('checked.fu.radio');
+			}
+			else {
+				$radio.prop('checked', false);
+				$lbl.removeClass('checked');
+				$containerToggle.addClass('hidden');
+				$lbl.trigger('unchecked.fu.radio');
 			}
 
-			//toggle container
-			this.toggleContainer();
+			$lbl.trigger('changed.fu.radio', checked);
 		},
 
-		resetGroup: function () {
-			var group = $('input[name="' + this.groupName + '"]');
-
-			group.each(function () {
-				var lbl = $(this).parent('label');
-				lbl.removeClass('checked');
-				lbl.parent('.radio').removeClass('checked');
-			});
-		},
+		setDisabledState: function(element, disabled) {
+			var $radio = element;
+			var $lbl = this.$label;
 
-		enable: function () {
-			this.$radio.attr('disabled', false);
-			this.$label.removeClass('disabled');
-			if (this.isBlockWrapped) {
-				this.$blockWrapper.removeClass('disabled');
+			if(disabled) {
+				this.$radio.prop('disabled', true);
+				$lbl.addClass('disabled');
+				$lbl.trigger('disabled.fu.radio');
 			}
-		},
-
-		disable: function () {
-			this.$radio.attr('disabled', true);
-			this.$label.addClass('disabled');
-			if (this.isBlockWrapped) {
-				this.$blockWrapper.addClass('disabled');
+			else {
+				this.$radio.prop('disabled', false);
+				$lbl.removeClass('disabled');
+				$lbl.trigger('enabled.fu.radio');
 			}
 		},
 
-		itemchecked: function (e) {
-			var radio = $(e.target);
-
-			this.resetGroup();
-			this.setState(radio);
+		itemchecked: function (evt) {
+			var $radio = $(evt.target);
+			this.setCheckedState($radio, true);
 		},
 
 		check: function () {
-			this.resetGroup();
-			this.$radio.prop('checked', true);
-			this.$radio.attr('checked', 'checked');
-			this.setState(this.$radio);
+			this.setCheckedState(this.$radio, true);
 		},
 
-		toggleContainer: function () {
-			var group;
-			if (this.$toggleContainer) {
-				// show corresponding container for currently selected radio
-				if (this.isChecked()) {
-					// hide containers for each item in group
-					group = $('input[name="' + this.groupName + '"]');
-					group.each(function () {
-						var selector = $(this).attr('data-toggle');
-						$(selector).addClass('hidden');
-						$(selector).attr('aria-hidden', 'true');
-					});
-					this.$toggleContainer.removeClass('hide hidden'); // hide is deprecated
-					this.$toggleContainer.attr('aria-hidden', 'false');
-				} else {
-					this.$toggleContainer.addClass('hidden');
-					this.$toggleContainer.attr('aria-hidden', 'true');
-				}
+		uncheck: function () {
+			this.setCheckedState(this.$radio, false);
+		},
 
-			}
+		isChecked: function () {
+			var checked = this.$radio.prop('checked');
+			return checked;
 		},
 
-		uncheck: function () {
-			this.$radio.prop('checked', false);
-			this.$radio.removeAttr('checked');
-			this.setState(this.$radio);
+		enable: function () {
+			this.setDisabledState(this.$radio, false);
 		},
 
-		isChecked: function () {
-			return this.$radio.is(':checked');
+		disable: function () {
+			this.setDisabledState(this.$radio, true);
+		},
+
+		destroy: function () {
+			this.$label.remove();
+			// remove any external bindings
+			// [none]
+			// empty elements to return to original markup
+			// [none]
+			return this.$label[0].outerHTML;
 		}
 	};
 
@@ -216,8 +196,8 @@
 
 	// DATA-API
 
-	$(document).on('mouseover.fu.checkbox.data-api', '[data-initialize=radio]', function (e) {
-		var $control = $(e.target).closest('.radio').find('[type=radio]');
+	$(document).on('mouseover.fu.radio.data-api', '[data-initialize=radio]', function (e) {
+		var $control = $(e.target);
 		if (!$control.data('fu.radio')) {
 			$control.radio($control.data());
 		}
@@ -225,13 +205,14 @@
 
 	// Must be domReady for AMD compatibility
 	$(function () {
-		$('[data-initialize=radio] [type=radio]').each(function () {
+		$('[data-initialize=radio]').each(function () {
 			var $this = $(this);
-			if ($this.data('fu.radio')) return;
-			$this.radio($this.data());
+			if (!$this.data('fu.radio')) {
+				$this.radio($this.data());
+			}
 		});
 	});
 
 	// -- BEGIN UMD WRAPPER AFTERWORD --
 }));
-// -- END UMD WRAPPER AFTERWORD --
+// -- END UMD WRAPPER AFTERWORD --
\ No newline at end of file
diff --git a/js/scheduler.js b/js/scheduler.js
index eee3b9af5..85b5b0b94 100644
--- a/js/scheduler.js
+++ b/js/scheduler.js
@@ -99,7 +99,7 @@
 		this.$element.find('.datepicker').on('changed.fu.datepicker', $.proxy(this.changed, this));
 		this.$element.find('.selectlist').on('changed.fu.selectlist', $.proxy(this.changed, this));
 		this.$element.find('.spinbox').on('changed.fu.spinbox', $.proxy(this.changed, this));
-		this.$element.find('.repeat-monthly .radio, .repeat-yearly .radio').on('change.fu.scheduler', $.proxy(this.changed, this));
+		this.$element.find('.repeat-monthly .radio-custom, .repeat-yearly .radio-custom').on('change.fu.scheduler', $.proxy(this.changed, this));
 	};
 
 	Scheduler.prototype = {
@@ -122,7 +122,7 @@
 			this.$element.find('.datepicker').datepicker('destroy');
 			this.$element.find('.selectlist').selectlist('destroy');
 			this.$element.find('.spinbox').spinbox('destroy');
-			this.$element.find('[type=radio]').radio('destroy');
+			this.$element.find('.radio-custom').radio('destroy');
 			this.$element.remove();
 
 			// any external bindings
@@ -609,7 +609,7 @@
 			this.$element.find('.datepicker').datepicker(action);
 			this.$element.find('.selectlist').selectlist(action);
 			this.$element.find('.spinbox').spinbox(action);
-			this.$element.find('[type=radio]').radio(action);
+			this.$element.find('.radio-custom').radio(action);
 
 			if (action === 'disable') {
 				action = 'addClass';
diff --git a/less/radio.less b/less/radio.less
index 66e06ed8e..717ee0b04 100644
--- a/less/radio.less
+++ b/less/radio.less
@@ -1,4 +1,5 @@
 .radioTabbing() {
+
 	/* for keyboard tabbing */
 	input[type="radio"]:focus + .radio-label,
 	input[type="radio"]:hover + .radio-label,
@@ -6,17 +7,29 @@
 		color: @grayLight;
 	}
 }
-
-
 .radio {
 	&.highlight {
 		padding: 4px;
 		margin: 0 0 5px 0;
-		& + & {
-			margin-top: -9px;
 
+		& + .radio.highlight {
+			margin-top: -9px;
 		}
-		&.checked {
+		& label.radio-custom {
+			left: -8px;
+			padding: 4px 4px 4px 24px;
+			border-radius: @baseBorderRadius;
+			&:before {
+				left: 5px;
+				top: 7px;
+			}
+			&:after {
+				left: 9px;
+				top: 11px;
+			}
+		}
+		&.checked label.radio-custom,
+		& label.radio-custom.checked {
 			background: #e9e9e9;
 			border-radius: @baseBorderRadius;
 		}
@@ -28,29 +41,32 @@
 	.radio-label:hover {
 		color: @grayLight;
 	}
-
 }
-
-.form-horizontal .radio-inline{
+.form-horizontal .radio-inline {
 	padding-top: 0;
 }
-
 .input-group-addon.radio-custom.radio-inline {
 	&:before {
 		left: 11px;
 		top: 9px;
 	}
-
 	&:after {
 		left: 15px;
 		top: 13px;
 	}
 }
-
-
 .radio-custom {
 	position: relative;
 
+	.highlight {
+		padding: 4px;
+		margin: 0 0 5px 0;
+
+		&.checked {
+			background: #e9e9e9;
+			border-radius: @baseBorderRadius;
+		}
+	}
 	&:after {
 		background: transparent;
 		border-radius: 6px;
@@ -61,9 +77,7 @@
 		top: 7px;
 		width: 6px;
 	}
-
-	&:before
-	{
+	&:before {
 		border: 1px solid #adadad;
 		border-radius: 14px;
 		content: " ";
@@ -73,55 +87,48 @@
 		top: 3px;
 		width: 14px;
 	}
-
 	&.checked {
 		&:after {
 			background: #fff;
 		}
-
 		&:before {
 			background: #39b3d7;
 			border-color: #39b3d7;
 		}
 	}
-
 	&.disabled {
 		cursor: not-allowed;
 
 		&:after {
 			cursor: not-allowed;
 		}
-
 		&:before {
 			cursor: not-allowed;
 			opacity: .5;
 		}
 	}
-
 	&.radio-inline {
 		&:after {
 			left: 4px;
 			top: 7px;
 		}
-
 		&:before {
 			left: 0;
 			top: 3px;
 		}
-
 		&.highlight {
+			left: -3px;
+
 			padding: 4px 4px 4px 24px;
 
 			&:after {
 				left: 8px;
 				top: 11px;
 			}
-
 			&:before {
 				left: 4px;
 				top: 7px;
 			}
-
 			&.checked {
 				background: #e9e9e9;
 				border-radius: @baseBorderRadius;
@@ -133,11 +140,7 @@
 	input[type="radio"]:focus + .radio-label {
 		color: @grayLight;
 	}
-
 }
-
-
 label.radio-custom.radio-inline {
 	padding-left: 20px;
-}
-
+}
\ No newline at end of file
diff --git a/test/markup/radio-markup.html b/test/markup/radio-markup.html
index 7ef3ce3b1..e752822dd 100644
--- a/test/markup/radio-markup.html
+++ b/test/markup/radio-markup.html
@@ -1,47 +1,42 @@
 <div id="MyRadioContainer">
 
-	<div id="RadioWrapper1" class="radio">
-		<label class="radio-custom" id="lbl1">
-			<input id="radio1" checked="checked" data-toggle="#radioToggle1" name="radio1a" type="radio">
-			<span class="radio-label">Custom appearance radio selected on page load <i>with linked element visibility toggle by id</i></span>
+	<div id="RadioCheckedEnabled" class="radio">
+		<label class="radio-custom">
+			<input class="sr-only checked" type="radio" checked="checked" id="Radio1">
+			<span class="radio-label">Checked/Enabled</span>
 		</label>
 	</div>
 
-	<div id="RadioWrapper2" class="radio">
-		<label class="radio-custom" id="lbl2">
-			<input id="radio2" data-toggle=".radioToggle2" name="radio1a" type="radio">
-			<span class="radio-label">Custom appearance radio not selected on page load <i>with linked element visibility toggle by class</i></span>
+	<div id="RadioCheckedDisabled" class="radio">
+		<label class="radio-custom">
+			<input class="sr-only checked" type="radio" checked="checked" disabled="disabled">
+			<span class="radio-label">Checked/Disabled</span>
 		</label>
 	</div>
 
-	<div id="RadioWrapper3" class="radio">
-		<label class="radio-custom" id="lbl3">
-			<input id="radio3" checked="checked" disabled="disabled" name="radio1b" type="radio">
-			<span class="radio-label">Disabled custom appearance radio selected on page load</span>
+	<div id="RadioUncheckedEnabled" class="radio">
+		<label class="radio-custom">
+			<input class="sr-only checked" type="radio">
+			<span class="radio-label">Unchecked/Enabled</span>
 		</label>
 	</div>
 
-	<div id="RadioWrapper4" class="radio">
-		<label class="radio-custom" id="lbl4">
-			<input id="radio4" disabled="disabled" name="radio1b" type="radio">
-			<span class="radio-label">Disabled custom appearance radio not selected on page load</span>
+	<div id="RadioUncheckedDisabled" class="radio">
+		<label class="radio-custom">
+			<input class="sr-only checked" type="radio" disabled="disabled">
+			<span class="radio-label">Unchecked/Disabled</span>
 		</label>
 	</div>
 
-	<br/>
-	<!--Inline radios-->
-	<label class="radio-custom radio-inline" data-initialize="radio" id="myCustomInlineRadio1">
-		<input checked="checked" class="checked sr-only" name="radio3" type="radio" value=""> <span class="radio-label">1, 2, buckle my shoe</span>
-	</label>
-	<label class="radio-custom radio-inline" data-initialize="radio" id="myCustomInlineRadio2">
-		<input class="sr-only" name="radio3" type="radio" value=""> <span class="radio-label">3, 4, shut the door</span>
-	</label>
-	<label class="radio-custom radio-inline" data-initialize="radio" id="myCustomInlineRadio3">
-		<input class="sr-only" disabled="disabled" name="radio4" type="radio" value=""> <span class="radio-label">5, 6, pick up sticks</span>
-	</label>
-	<label class="radio-custom radio-inline" data-initialize="radio" id="myCustomInlineRadio4">
-		<input checked="checked" class="checked sr-only" disabled="disabled" name="radio4" type="radio" value=""> <span class="radio-label">7, 8, lay them straight</span>
-	</label>
 
+	<div id="RadioToggle">
+		<div class="radio">
+			<label class="radio-custom">
+				<input type="radio" class="sr-only" data-toggle=".radioToggle">
+				Custom radio toggles by class
+			</label>
+		</div>
+		<div class="radioToggle hidden">This message's visibility toggles by class with a radio above.</div>
+	</div>
 
 </div>
\ No newline at end of file
diff --git a/test/radio-test.js b/test/radio-test.js
index d2b0440e4..c61d5701f 100644
--- a/test/radio-test.js
+++ b/test/radio-test.js
@@ -19,88 +19,256 @@ define(function(require){
 	});
 
 	test("should return element", function () {
-		var $radio1 = $(html).find('#radio1');
+		var $radio1 = $(html).find('#Radio1');
 		ok($radio1.radio() === $radio1, 'radio should be initialized');
 	});
 
-	test("should set initial state", function () {
+	test("should set initial state for checked/enabled", function () {
+		var $element = $(html).find('#RadioCheckedEnabled').clone();
 
-		// init radios
-		$(html).find('input').radio();
+		// initialize radio
+		$element.find('label').radio();
 
-		// checked/enabled
-		var l1 = $(html).find('#lbl1');
-		equal(l1.hasClass('checked'), true, 'radio1 has checked class');
-		equal(l1.hasClass('disabled'), false, 'radio1 does not have disabled class');
+		// ensure label has checked class
+		var checked = $element.find('label').hasClass('checked');
+		equal(checked, true, 'label has "checked" class when input is checked');
 
-		// unchecked/enabled
-		var l2 = $(html).find('#lbl2');
-		equal(l2.hasClass('checked'), false, 'radio2 does not have checked class');
-		equal(l2.hasClass('disabled'), false, 'radio2 does not have disabled class');
+		// ensure label does not have disabled class
+		var disabled = $element.find('label').hasClass('disabled');
+		equal(disabled, false, 'label does not have "disabled" class when input is enabled');
+	});
+
+	test("should set initial state for checked/disabled", function () {
+		var $element = $(html).find('#RadioCheckedDisabled').clone();
 
-		// checked/disabled
-		var l3 = $(html).find('#lbl3');
-		equal(l3.hasClass('checked'), true, 'radio3 has checked class');
-		equal(l3.hasClass('disabled'), true, 'radio3 has disabled class');
+		// initialize radio
+		$element.find('label').radio();
 
-		// unchecked/disabled
-		var l4 = $(html).find('#lbl4');
-		equal(l4.hasClass('checked'), false, 'radio4 does not have checked class');
-		equal(l4.hasClass('disabled'), true, 'radio4 has disabled class');
+		// ensure label has checked class
+		var checked = $element.find('label').hasClass('checked');
+		equal(checked, true, 'label has "checked" class when input is checked');
+
+		// ensure label has disabled class
+		var disabled = $element.find('label').hasClass('disabled');
+		equal(disabled, true, 'label has "disabled" class when input is disabled');
 	});
 
-	test("should disable/enable radio", function () {
-		var $radio1 = $(html).find('#radio1');
+	test("should set initial state for unchecked/enabled", function () {
+		var $element = $(html).find('#RadioUncheckedEnabled').clone();
+
+		// initialize radio
+		$element.find('label').radio();
 
-		equal($radio1.is(':disabled'), false, 'enabled - default state');
-		$radio1.radio('disable');
-		equal($radio1.is(':disabled'), true, 'disabled');
-		$radio1.radio('enable');
-		equal($radio1.is(':disabled'), false, 're-enabled');
+		// ensure label does not have checked class
+		var checked = $element.find('label').hasClass('checked');
+		equal(checked, false, 'label does not have "checked" class when input is unchecked');
+
+		// ensure label does not have disabled class
+		var disabled = $element.find('label').hasClass('disabled');
+		equal(disabled, false, 'label does not have "disabled" class when input is enabled');
 	});
 
-	test("should check/uncheck radio group", function () {
-		var $fixture = $(html).appendTo('#qunit-fixture');
-		var $radio1 = $fixture.find('#radio1');
-		var $l1 = $fixture.find('#lbl1');
-		var $radio2 = $fixture.find('#radio2');
-		var $l2 = $fixture.find('#lbl2');
+	test("should set initial state for unchecked/disabled", function () {
+		var $element = $(html).find('#RadioUncheckedDisabled').clone();
 
-		$fixture.find('input').radio();
+		// initialize radio
+		$element.find('label').radio();
 
-		equal($l1.hasClass('checked'), true, 'checked - default state radio 1');
-		equal($l2.hasClass('checked'), false, 'unchecked - default state radio 2');
+		// ensure label does not have checked class
+		var checked = $element.find('label').hasClass('checked');
+		equal(checked, false, 'label does not have "checked" class when input is unchecked');
 
-		$radio2.radio('check');
+		// ensure label has disabled class
+		var disabled = $element.find('label').hasClass('disabled');
+		equal(disabled, true, 'label has "disabled" class when input is disabled');
+	});
 
-		equal($l1.hasClass('checked'), false, 'unchecked - radio 1 confirmation by css class');
-		equal($radio1.is(':checked'), false, 'unchecked - radio 1 confirmation by is(:checked)');
-		equal($radio1.radio('isChecked'), false, 'unchecked - radio 1 confirmation by isChecked method');
-		equal($l2.hasClass('checked'), true, 'checked - radio 2 confirmation by css class');
-		equal($radio2.is(':checked'), true, 'checked - radio 2 confirmation by is(:checked)');
-		equal($radio2.radio('isChecked'), true, 'checked - radio 2 confirmation by isChecked method');
+	test("should disable radio", function () {
+		var $element = $(html).find('#RadioUncheckedEnabled').clone();
+		var $input = $element.find('input[type="radio"]');
 
-		$radio1.radio('check');
+		// initialize radio
+		var $radio = $element.find('label').radio();
 
-		$fixture.remove();
+		// set disabled state
+		equal($input.prop('disabled'), false, 'radio enabled initially');
+		$radio.radio('disable');
+		equal($input.prop('disabled'), true, 'radio disabled after calling disable method');
 	});
 
-	test("should destroy control", function () {
-		var id = '#radio1';
-		var $el = $(html).find(id);
-		var $parent = $el.closest('.radio');
+	test("should enable radio", function () {
+		var $element = $(html).find('#RadioUncheckedDisabled').clone();
+		var $input = $element.find('input[type="radio"]');
+
+		// initialize radio
+		var $radio = $element.find('label').radio();
+
+		// set enabled state
+		equal($input.prop('disabled'), true, 'radio disabled initially');
+		$radio.radio('enable');
+		equal($input.prop('disabled'), false, 'radio enabled after calling enable method');
+	});
+
+	test("should check radio", function () {
+		var $element = $(html).find('#RadioUncheckedEnabled').clone();
+		var $input = $element.find('input[type="radio"]');
+
+		// initialize radio
+		var $radio = $element.find('label').radio();
+
+		// set checked state
+		equal($input.prop('checked'), false, 'radio unchecked initially');
+		$radio.radio('check');
+		equal($input.prop('checked'), true, 'radio checked after calling check method');
+	});
+
+	test("should uncheck radio", function () {
+		var $element = $(html).find('#RadioCheckedEnabled').clone();
+		var $input = $element.find('input[type="radio"]');
+
+		// initialize radio
+		var $radio = $element.find('label').radio();
 
-		equal($el.radio('destroy'), '' + $parent[0].outerHTML, 'returns markup');
-		equal( $(html).find(id).length, false, 'element has been removed from DOM');
+		// set checked state
+		equal($input.prop('checked'), true, 'radio checked initially');
+		$radio.radio('uncheck');
+		equal($input.prop('checked'), false, 'radio unchecked after calling uncheck method');
 	});
 
-	test("should destroy control [INLINE]", function () {
-		var id = '#myCustomInlineRadio1';
-		var $el = $(html).find(id);
-		var $parentInline = $el.closest('.radio-inline');
+	test("should return checked state", function () {
+		var $element = $(html).find('#RadioCheckedEnabled').clone();
+		var $input = $element.find('input[type="radio"]');
+
+		// initialize radio
+		var $radio = $element.find('label').radio();
+
+		// verify checked state changes with uncheck method
+		$radio.radio('uncheck');
+		equal($radio.radio('isChecked'), false, 'radio state is unchecked');
+
+		// verify checked state changes with check method
+		$radio.radio('check');
+		equal($radio.radio('isChecked'), true, 'radio state is checked');
+	});
+
+	test("should trigger checked event when calling check method", function () {
+		var $element = $(html).find('#RadioUncheckedEnabled').clone();
+
+		// initialize radio
+		var $radio = $element.find('label').radio();
+
+		var triggered = false;
+		$radio.on('checked.fu.radio', function(){
+			triggered = true;
+		});
+
+		$radio.radio('check');
+
+		equal(triggered, true, 'checked event triggered');
+	});
+
+	test("should trigger unchecked event when calling uncheck method", function () {
+		var $element = $(html).find('#RadioCheckedEnabled').clone();
+
+		// initialize radio
+		var $radio = $element.find('label').radio();
+
+		var triggered = false;
+		$radio.on('unchecked.fu.radio', function(){
+			triggered = true;
+		});
+
+		$radio.radio('uncheck');
 
-		equal($el.radio('destroy'), '' + $parentInline[0].outerHTML, 'returns markup');
-		equal( $(html).find(id).length, false, 'element has been removed from DOM');
+		equal(triggered, true, 'unchecked event triggered');
 	});
 
-});
+	test("should trigger changed event when calling checked/unchecked method", function () {
+		var $element = $(html).find('#RadioCheckedEnabled').clone();
+
+		// initialize radio
+		var $radio = $element.find('label').radio();
+
+		var triggered = false;
+		var state = false;
+		$radio.on('changed.fu.radio', function(evt, data){
+			triggered = true;
+			state = data;
+		});
+
+		$radio.radio('uncheck');
+
+		equal(triggered, true, 'changed event triggered');
+		equal(state, false, 'changed event triggered passing correct state');
+	});
+
+	test("should trigger changed event when clicking on input element", function () {
+		var $element = $(html).find('#RadioUncheckedEnabled').clone();
+		var $input = $element.find('input[type="radio"]');
+		$element.appendTo(document.body); // append to body to capture clicks
+
+		// initialize radio
+		var $radio = $element.find('label').radio();
+
+		var triggered = false;
+		$element.on('changed.fu.radio', function(){
+			triggered = true;
+		});
+
+		$input.click();
+		equal(triggered, true, 'changed event triggered');
+
+		$element.remove();
+	});
+
+	test("should trigger changed event when clicking on input element", function () {
+		var $element = $(html).find('#RadioUncheckedEnabled').clone();
+		var $input = $element.find('input[type="radio"]');
+		$element.appendTo(document.body); // append to body to capture clicks
+
+		// initialize radio
+		var $radio = $element.find('label').radio();
+
+		var triggered = false;
+		$element.on('changed.fu.radio', function(){
+			triggered = true;
+		});
+
+		$input.click();
+		equal(triggered, true, 'changed event triggered');
+
+		$element.remove();
+	});
+
+	test("should toggle radio container visibility", function() {
+		var $element = $(html).find('#RadioToggle').clone();
+		var $container = $element.find('.radioToggle');
+		$element.appendTo(document.body); // append to body to check visibility
+
+		// initialize radio
+		var $radio = $element.find('label').radio();
+
+		equal($container.is(':visible'), false, 'toggle container hidden by default');
+		$radio.radio('check');
+		equal($container.is(':visible'), true, 'toggle container visible after check');
+		$radio.radio('uncheck');
+		equal($container.is(':visible'), false, 'toggle container hidden after uncheck');
+
+		$element.remove();
+	});
+
+	test("should destroy radio", function() {
+		var $element = $(html).find('#RadioCheckedEnabled').clone();
+
+		// initialize radio
+		var $radio = $element.find('label').radio();
+		var originalMarkup = $element.find('label')[0].outerHTML;
+
+		equal($element.find('#Radio1').length, 1, 'radio exists in DOM by default');
+
+		var markup = $radio.radio('destroy');
+
+		equal(originalMarkup, markup, 'returned original markup');
+		equal($element.find('#Radio1').length, 0, 'radio removed from DOM');
+	});
+});
\ No newline at end of file