Unit tests added to package and useless classes removed