modified tests ... removed unnecessary functions