moving tests into separate directory