Remove an unused method
Use the correct value for dict keys
Exact an @ sign when parsing tokens
Successful parser test