Rename test
Fix test
Add unit test
Rename constant
Rework statement parsing
Fix tests
Improve code coverage
Rename test methods