* Small tweaks to the tests and library