Reformat tests, change yardis regex to use regex properly