Test clean real

Final set of tweaks, test fixes, and removals to allow "ant test" to run clean. Depends upon my latest merge request into the SQL layer. This at least gets us to a stable, clean state with the tests and the code. We can enable the tests as bugs are fixed or functionality is added to the sql-layer itself.