Merge "Consolidate unit tests."