TST: beefier, class-based tests