editing tests
merged test conflicts and updated readme