refactor test-connect and test-setup-database to be these two separate things (from...