Better testing and use an object wrapper for _id