moved tests into one package