Updating tests to exercise new functionality as expected.