Cleanup for getting a first unit test to work