New tests. Fix for register deferred