added tests and more files