updated router regex, added more tests