restoring commented tests