Better tests and comments