Race fix + enhanced datatype test