shorter regexp and some tests added