cleanup
dry up copy-paste foo
make tests a little faster ...