Flesh out test suite a bit, fix #10