Refactoring and Net45 Tests

Started with @69b225e, figured being able to test the change from the VS project would be good too.