Add the things needed for couch tests