Added more test cases and moved the test case into its own suite also
fixed the regEX