Minor corrections to Binary and File tests