Better tests for mocked response. Also fix 404 catch