Bug squash: remove annoying printout, fix tests