Fixed a bug in ContentBlock.__eq__ and other bugs
found as a result of fixing ContentBlock.__eq__
Changed tests to more fully test the ContentBlock.__eq__ method