Changes to get tests to work