Updated with better regex test.