Parser work
Cleaned test code