removed unneeded files, modified tests