unit tests complete with boundaries
fixed regex
merged pull