More changes to get tests to work