Timer fixed on Mac OSX, added file test for -ptest