removed general test class, created test package