debugging, cleanup
made tests a little more deterministic