merged antientropy code and test cases code