Cleand up test
Removed parsing comments
Code refactoring