Merge "Change the expected status response from Forbidden to NotFound"