After fixing the lazy connection this test refactor was unnecessary, reverting.