Fixed regexp
Fixed some tests