Helper method and new tests.