herded tests back to their appropriate folder