Resolved a TODO
Fixed test for incorrect regexp