A few more tests and fixes for deferred