Unit tests and comments