[Nicolette] Added regex to the step definitions & made some of the feature files more readable
[Nicolette] Made more changes to the regex so the build won't fail