Correct method, tests and documentation