completed comments and tests