correct comments
optimize test
excluded tests