starting working on deferred requests
Fixes for tests