Cleaned up some residual merging mess
Fixed some of the tests after addition of garbage collection and a test for collect_garbage method.