@ryanwkan, don't need to change your existing codes, both cases should be tested separately.
Don't worry about the test codes. It will be refactored later.