Comment out deferred tests to avoid confusion
More improvement of assertion error msgs