added regex, condensed operator test funcs, added some tests