Finish tests and comments