Fix unit tests that was mistakenly reverted.