Fixes regex, adds more tests for humantime