Now service name does not need version, more tests and stuff