moved tests around for a better project structure