Improved tests, added regex tests