Merge "Harmony: Refactor tests"