Attempting to get unit tests to work
Removing old classes