Simplify tests
Use bespoke-classes in demo