main
Cleanup test methods
Use raw strings in tests
Use collection expressions
Update version property name