extend and refactor deferred test suite