Update regex to remove single-space delim support. Add more spec tests.