more tests, and some small style changes asked by gasche