Test cleanup
Fixed merge conflicts