Use through2 for better stream interface, also updated tests with unix file-paths