Enabled commented out tests