Unify naming
Improve stability of test cases