-- Added new error and success response
-- Fixed test to adjust the new error and success response