adding tests back, fixing up regex one more time