corrected Regular expressions after testing
tests ran with jasmine (0 failures)