Two steps forward, one step back. Re-fix unit test failures.