changes to allow tests to pass