Refactored, using feign for client testing