added test package, replace test class to test package