Fix hyphen splitting regex
Fix out-of-bounds bug
More tests