Add test deps and remove unnecessary folders