Added some missing files; removed unneeded test files