Changes to get tests to compile