Merge "Remove duplicate unit test module"