@@ 1,15 1,18 @@ 
 #!/usr/bin/env perl
 
-package main;
+require '../bin/raw2c';
+
+package Raw2CTestSuite;
 use strict;
 use warnings;
+use Moose;
 use POSIX qw(EXIT_SUCCESS);
 use Test::More 0.96;
 use Test::Output;
 
-require '../bin/raw2c';
+extends 'Test::Module::Runnable';
 
-sub main {
+sub testStrings {
 	plan tests => 3;
 
 	my $sut = Main->new();

          
@@ 34,4 37,7 @@ sub main {
 	return EXIT_SUCCESS;
 }
 
-exit(main());
+package main;
+use strict;
+use warnings;
+exit(Raw2CTestSuite->new->run());