moving tests to sub directory