Merge "Clean up unit tests."