Can you please move these tests into their own file, for parity with the header files?