some convention fixing in tests