make tests reliable; unexport fields and types