main
Use collection expressions
Revert
Use raw strings in tests
Remove unused usings
Update tests
Cleanup test methods