Cleanup App tests
Clean up Token service and tests
Get token.rm() tests