Fix failing tests due to differing defaults