Modified some tests to use dbunit