shorten lines
fix deferred unit test