Add tests and update README.md.d