Fixed some tests, moved regex strings