Updated regexp and added tests