Getting more of the unit tests to pass again