fixed a datasource error where the database information was in the test, also added the rest of the tables