Add tests and method