Fully refactored test project; tests broken into individual classes