Refactor | Kyle and Bev | Deleted a bunch of functional tests