Combining the tests is an enhancement, so that could be held off until later. It doesn't hurt anything to have them separate for now. I don't consider changing the test names an enhancement in the sense that the test itself is not changing.