Clean up tests, account for pre-1.4 csv encoding with a const bool