Fix tests

Here are some updated regex's for the tests to pass.