roll tests into class