Updated tests to new database