SQL fix, still hangs in mvn test