Replaced shelve with caliendo.patch for tests