fixed comments and tests