minor changes to regex
Added more lines to test
More small regex changes