Refactor | Kyle and Bev | Renamed functional test