fixed tests + removed unnecessary code