Do not import test packages in non-test code, update dependencies