move tests into proper place