Fixed all but 1 unit test failures in next