File reorder, fix tests for 64 bit