Implemented 'invalid token' errors, made sure parsing test failures account for the right error message