removed some debug messages, and updated the tests to be a little more sane, we hope. the royal we.