Readded code to select a different database number in the tests