Fixed regexp
Fixed tests