Rework a bit isolation tests