Migrated to VS2010
Refactored tests to use a shared method
Removed vestages of initial approach
Made it pass multiple A tests