Fix ADT regex pattern
More ADT tests, more features.
More ADT tests, more features.