Update tests and fix aggressive regex