More would be good ;-)

But I accomplished 97% test coverage with the latest commits.