fix unix filepath problem and fix up some tests