Add tests and doc info