Remove spoiler
Remove unused import in tests
Merge branch 'develop'