Create Insert Class with insert by query or pojo
Polish ObjectId tests
Convert WithCustomId into ExternalFriend