Move tests into correct locations, another attempt at introducing connection pooling, better this time