refactoring this test a bit.