moved all tests into register