Add tests and fix comments