Break up tests into two