WIP: Need to update tests and db seed file