fixed comments and tests. Still failing, though