Regex needed tweaking. Changed up some tests