Test added and fix in expected-response order