More generic tests
Simplified demo