More tests, and fixed delimiter