Updated DBunit tests