test service, refactor controller