More tests, which uncovered (now fixed) bugs and inconsistencies