Fixed comments and tests