Refactored tests and #delimiter