Fixes two more test failures. 2 left.