Fixed the out-of-the-box unit tests