added test and more files