* add apikey is_revoked field * add token store tests * Apply suggestions from code review * remove unused fields