Fix test stubs to return proper data and base class to handle response better