Made tokenizer trip whitespace at the beginning of fields, fixed conversion issue, expanded tests