Aligned test case naming
Merge