More tests and comments