rename methods/vars + few tests