removed unnecessary sysouts
moved tests to correct Folder