IDE-1028

This commit just remove the new pattern code to the default and re-modified the JUnit tests.