Removed unit testing and made changes to return response