Updating tests for consistency
Factoring out parser