Fixing a typo in DB, solving #135 and updating tests