Move tests into better package structure, remove connection pooling temporarily (failing to release)