more tests and regex