Fixes to get tests to pass