Restored other tests before pull request