Merge pull request #97 from mattyb149/bad-35

BAD-35: Made call to request JDBC driver more generic
Merge pull request #98 from mattyb149/bad-35

BAD-35: Moved test packages to match code-under-test packages
BAD-35: fixed package errors in test code