Cleanup test code and make syntax more parser friendly