fixed some tests and comments