Move common responses to new package + fix tests accordingly