move test stuff into tests dir