Fixed issues with broken tests for parsing