Further autoclosing of preparedStatements

Attempting to fix leakage of connections in the tests.