Fixed Regex, and Test Errors, TESTS PASSED