Completed tests and tweaked regex order