Delete ServiceManifest, move tests