Moved test and mock dirs to wherer they should be