Moved Test class to the right directory