Include Jens' work for DBI-Test