update bson converter methods, update tests