Moved Test class to a better placed folder