Moved the Test class to the corresponding test package