Suite changes + pre-tokenization rules