file restructuring continues. remove redundunt tests