simplify and improve test with simon's new base class