Working on getting tests to compile again