Remove unneeded files, added test files to project