Add tests and update README