changelog, tests, slight reorg for #187