Refactor the REST server for easier testing, start work on fixing the issue with hydrating results from save() operations