Fix for assert.Nil, assert.NotNil