refactoring test packages

changed the test package

@rsaravind