fixed tests and added deleted files