Update regex and tests

@djreimer please review. Seems to work here: http://rubular.com/r/evB7RlvUfI and passed all tests.