Add more robust test for all features && speed up new optional clauses method