removed dulicate ifdeftoif files and tests