moved some tests into own files