More tests, commenting.