Moving over to JPA persistence, and seperating the storage model from the json recieved so we can easily decouple these items later.  Database is now configured using the same methodology for tests and code.  All SQL specific code is removed.  Better testing model is in place (with better tests) and we've moved over to useing the Spring Boot correctly.