Merge "Fix base unit test class location"