Update tests, and normalize responses