diff --git a/test/widgets/CalendarWidgetTest.php b/test/widgets/CalendarWidgetTest.php
new file mode 100644
index 0000000..2b87867
--- /dev/null
+++ b/test/widgets/CalendarWidgetTest.php
@@ -0,0 +1,51 @@
+<?php
+
+require_once('PHPUnit/Framework.php');
+require_once('MockPress/mockpress.php');
+require_once(dirname(__FILE__) . '/../../widgets/CalendarWidget.inc');
+
+class CalendarWidgetTest extends PHPUnit_Framework_TestCase {
+	function setUp() {
+		_reset_wp();
+		$this->w = new CalendarWidget('id', 'name', array());
+	}
+
+	function providerTestUpdate() {
+		return array(
+			array(
+				array(), array()
+			),
+			array(
+				array('test' => 'test'), array()
+			),
+			array(
+				array('thumbnail' => 'title'), array('thumbnail' => 'title')
+			),
+			array(
+				array('thumbnail' => "<i>title</i>"), array('thumbnail' => 'title')
+			),
+			array(
+				array(
+					'thumbnail' => "test",
+					'small' => "test",
+					'medium' => "test",
+					'large' => "test",
+					'link' => "test",
+				), array(
+					'thumbnail' => "test",
+					'small' => "test",
+					'medium' => "test",
+					'large' => "test",
+					'link' => "test",
+				)
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider providerTestUpdate
+	 */
+	function testUpdate($input, $expected_output) {
+		$this->assertEquals($expected_output, $this->w->update($input));
+	}
+}
diff --git a/widgets/CalendarWidget.inc b/widgets/CalendarWidget.inc
new file mode 100644
index 0000000..cbc2f41
--- /dev/null
+++ b/widgets/CalendarWidget.inc
@@ -0,0 +1,102 @@
+<?php
+/*
+Widget Name: ComicPress Calendar
+Widget URI: http://comicpress.org/
+Description: Display a calendar of this months posts.
+Author: Philip M. Hofer (Frumph)
+Version: 1.01
+Author URI: http://frumph.net/
+*/
+
+
+class CalendarWidget extends WP_Widget {
+	function CalendarWidget() {
+		$widget_ops = array('classname' => 'CalendarWidget', 'description' => __('Display a calendar showing this months posts. (this calendar does not drop lines if there is no title given.)','comicpress') );
+		$this->WP_Widget('comicpress_calendar', __('ComicPress Calendar','comicpress'), $widget_ops);
+	}
+
+	function widget($args, $instance) {
+		global $post;
+		extract($args, EXTR_SKIP);
+
+		echo $before_widget;
+
+		if (!empty($instance)) { extract($instance); } ?>
+		<center>
+			<div id="wp-calendar-head"></div>
+			<div id="wp-calendar-wrap">
+				<?php if (!empty($thumbnail)) { ?>
+					<div class="wp-calendar-download">
+					<?php if (!empty($link)) { ?>
+						<a href="<?php echo esc_attr($link); ?>"><img src="<?php echo esc_attr($thumbnail); ?>" class="wp-calendar-thumb" alt="" /></a>
+					<?php } else { ?>
+						<img src="<?php echo esc_attr($thumbnail); ?>" class="wp-calendar-thumb" alt="" />
+					<?php } ?>
+						<div class="wp-calendar-download-links">
+							<?php if (!empty($small) || !empty($medium) || !empty($large)) { ?>
+								<?php _e('DOWNLOAD','comicpress'); ?>
+								<?php
+								  foreach (array(
+								    'small' => array(__('Download Small', 'comicpress'), __('S', 'comicpress')),
+								    'medium' => array(__('Download Medium', 'comicpress'), __('M', 'comicpress')),
+								  	'large' => array(__('Download Large', 'comicpress'), __('L', 'comicpress'))
+								 	) as $field => $text) {
+								 		if (!empty(${$field})) {
+								 			?><a href="<?php echo esc_attr(${$field}); ?>" title="<?php echo esc_attr($text[0]); ?>"><?php echo esc_html($text[1]); ?></a><?php
+								 		}
+								 	}
+							} ?>
+						</div>
+					</div>
+				<?php } ?>
+			<?php get_calendar(); ?>
+			</div>
+			<div id="wp-calendar-foot"></div>
+		</center>
+		<?php
+
+		echo $after_widget;
+	}
+
+	function update($new_instance, $old_instance = array()) {
+		$instance = array();
+		foreach (array('thumbnail', 'small', 'medium', 'large', 'link') as $field) {
+			if (isset($new_instance[$field])) {	$instance[$field] = strip_tags($new_instance[$field]); }
+		}
+
+		return $instance;
+	}
+
+	function form($instance) {
+		$instance = wp_parse_args( (array) $instance, array( 'thumbnail' => '', 'small' => '', 'medium' => '', 'large' => '', 'link' => '') );
+
+		$thumbnail = strip_tags($instance['thumbnail']);
+		$small = strip_tags($instance['small']);
+		$medium = strip_tags($instance['medium']);
+		$large = strip_tags($instance['large']);
+		$link = $instance['link'];
+
+		foreach (array(
+			'thumbnail' => __('Thumbnail URL (178px by 130px):','comicpress'),
+			'link' => array('label' => __('Add link on thumbnails:','comicpress'), 'after' => '<hr />'),
+			'small' => __('Wallpaper URL (Small):','comicpress'),
+			'medium' => __('Wallpaper URL (Medium):','comicpress'),
+			'large' => __('Wallpaper URL (Large):','comicpress'),
+		) as $field => $label) {
+			unset($after);
+			if (is_array($label)) { extract($label); }
+			?><p>
+				<label for="<?php echo $this->get_field_id($field); ?>"><?php echo esc_html($label) ;?>
+				<input class="widefat"
+							 id="<?php echo $this->get_field_id($field); ?>"
+							 name="<?php echo $this->get_field_name($field); ?>"
+							 type="text"
+							 value="<?php echo esc_attr($instance[$field]); ?>" />
+				</label>
+			</p><?php
+
+			if (isset($after)) { echo $after; }
+		}
+	}
+}
+
diff --git a/widgets/calendar.php b/widgets/calendar.php
deleted file mode 100644
index de355a0..0000000
--- a/widgets/calendar.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/*
-Widget Name: ComicPress Calendar
-Widget URI: http://comicpress.org/
-Description: Display a calendar of this months posts.
-Author: Philip M. Hofer (Frumph)
-Version: 1.01
-Author URI: http://frumph.net/
-
-*/
-
-function comicpress_calendar($instance = null) {
-	global $post; 
-	if (!empty($instance)) {
-		$thumbnail = $instance['thumbnail'];
-		$small = $instance['small'];
-		$medium = $instance['medium'];
-		$large = $instance['large'];
-		$link = $instance['link'];
-	}
-	?>
-	<center>
-	<div id="wp-calendar-head"></div>
-	<div id="wp-calendar-wrap">
-	<?php if (!empty($thumbnail)) { ?>
-		<div class="wp-calendar-download">
-		<?php if (!empty($link)) { ?>
-			<a href="<?php echo $link; ?>"><img src="<?php echo $thumbnail; ?>" class="wp-calendar-thumb" alt="" /></a>
-		<?php } else { ?>
-			<img src="<?php echo $thumbnail; ?>" class="wp-calendar-thumb" alt="" />
-		<?php } ?>
-			<div class="wp-clendar-download-links">
-				<?php if (!empty($small) || !empty($medium) || !empty($large)) { ?>
-					<?php _e('DOWNLOAD','comicpress'); ?> <?php if (!empty($small)) { ?><a href="<?php echo $small; ?>" title="<?php _e('Download Small','comicpress'); ?>"><?php _e('S','comicpress'); ?></a><?php } ?><?php if (!empty($medium)) { ?><a href="<?php echo $medium; ?>" title="<?php _e('Download Medium','comicpress'); ?>"><?php _e('M','comicpress'); ?></a><?php } ?><?php if (!empty($large)) { ?><a href="<?php echo $large; ?>" title="<?php _e('Download Large','comicpress'); ?>"><?php _e('L','comicpress'); ?></a><?php } ?>
-				<?php } ?>
-			</div>
-		</div>
-	<?php } ?>
-	<?php get_calendar(); ?>
-	</div>
-	<div id="wp-calendar-foot"></div>
-	</center>
-<?php }
-
-
-class widget_comicpress_calendar extends WP_Widget {
-	
-	function widget_comicpress_calendar() {
-		$widget_ops = array('classname' => 'widget_comicpress_calendar', 'description' => __('Display a calendar showing this months posts. (this calendar does not drop lines if there is no title given.)','comicpress') );
-		$this->WP_Widget('comicpress_calendar', __('Comicpress Calendar','comicpress'), $widget_ops);
-	}
-	
-	function widget($args, $instance) {
-		global $post;
-		extract($args, EXTR_SKIP); 
-		
-		echo $before_widget;
-		comicpress_calendar($instance);
-		echo $after_widget;
-	}
-	
-	function update($new_instance, $old_instance) {
-		$instance = $old_instance;
-		$instance['thumbnail'] = strip_tags($new_instance['thumbnail']);
-		$instance['small'] = strip_tags($new_instance['small']);
-		$instance['medium'] = strip_tags($new_instance['medium']);
-		$instance['large'] = strip_tags($new_instance['large']);
-		$instance['link'] = $new_instance['link'];
-		return $instance;
-	}
-	
-	function form($instance) {
-		$instance = wp_parse_args( (array) $instance, array( 'thumbnail' => '', 'small' => '', 'medium' => '', 'large' => '', 'link' => '') );
-		$thumbnail = strip_tags($instance['thumbnail']);
-		$small = strip_tags($instance['small']);
-		$medium = strip_tags($instance['medium']);
-		$large = strip_tags($instance['large']);
-		$link = $instance['link'];
-		?>
-		<p><label for="<?php echo $this->get_field_id('thumbnail'); ?>"><?php _e('Thumbnail URL (178px by 130px):','comicpress'); ?> <input class="widefat" id="<?php echo $this->get_field_id('thumbnail'); ?>" name="<?php echo $this->get_field_name('thumbnail'); ?>" type="text" value="<?php echo attribute_escape($thumbnail); ?>" /></label></p>
-		<p><label for="<?php echo $this->get_field_id('link'); ?>"><?php _e('Add link on thumbnail:','comicpress'); ?> <input class="widefat" id="<?php echo $this->get_field_id('link'); ?>" name="<?php echo $this->get_field_name('link'); ?>" type="text" value="<?php echo attribute_escape($link); ?>" /></label></p>
-		<hr>
-		<p><label for="<?php echo $this->get_field_id('small'); ?>"><?php _e('Wallpaper URL (Small):','comicpress'); ?> <input class="widefat" id="<?php echo $this->get_field_id('small'); ?>" name="<?php echo $this->get_field_name('small'); ?>" type="text" value="<?php echo attribute_escape($small); ?>" /></label></p>
-		<p><label for="<?php echo $this->get_field_id('medium'); ?>"><?php _e('Wallpaper URL (Medium):','comicpress'); ?> <input class="widefat" id="<?php echo $this->get_field_id('medium'); ?>" name="<?php echo $this->get_field_name('medium'); ?>" type="text" value="<?php echo attribute_escape($medium); ?>" /></label></p>
-		<p><label for="<?php echo $this->get_field_id('large'); ?>"><?php _e('Wallpaper URL (Large):','comicpress'); ?> <input class="widefat" id="<?php echo $this->get_field_id('large'); ?>" name="<?php echo $this->get_field_name('large'); ?>" type="text" value="<?php echo attribute_escape($large); ?>" /></label></p>
-		<p><label for="<?php echo $this->get_field_id('link'); ?>"><?php _e('Add link on thumbnail:','comicpress'); ?> <input class="widefat" id="<?php echo $this->get_field_id('link'); ?>" name="<?php echo $this->get_field_name('link'); ?>" type="text" value="<?php echo attribute_escape($link); ?>" /></label></p>
-		<?php
-	}
-}
-register_widget('widget_comicpress_calendar');
-
-
-function widget_comicpress_calendar_init() {    
-	new widget_comicpress_calendar(); 
-} 
-
-add_action('widgets_init', 'widget_comicpress_calendar_init');
-
-?>
\ No newline at end of file