Get tests passing after replacing ApiResponse w/ error types