Rather return null when a handler isn't found, also fixed unit test comments and allowed content object to be compared by id.