Added nondefault test and fixed delimiter bug