Some more tests. Full library test coverage now