Use static return values for stubs
Fix integration spec
Cleanup xway integration spec