Improve Unit Test coverage

Make sure only allowed field are returned in response.