Fix bug with service get and write tests to catch