some changes to get tests to pass