normalized database and added some failing tests in prep for adding user throttling