Starting to clean up test project and make it more readable