removing unneded test files, fixing breaking tests