Move common tests to their own method