Unify the test cases and cover all bases