Getting unit tests to pass again