Fixing expected responses. Mostly changed incoming requests and namespaces.