Enabled removed tests
Merge branch 'hotfix/0.8.4'