Added tests
Fixed regex to respect quotes