Changes made to correct things for the first round of sqlunit testing.