adapting the existing test and adding one.

Little refactor for clarity