Fixing BerkeleyDb.
Adding tests for BerkeleyDb
Adding 2 missing packages from BerkeleyDb, these two do not contain
//#IF annotations.