Some previous code changes were not taken over to the tests
Hopefully the last fix for the parsing issue