fix regexp, fix tests