updated junit tests, and fixes. All methods in SQLQueries (and sub classes) are tested, except for getUserHistory().  An updated DB is also included