re-pack and re-name the tests
re-pack and re-name test for SVC