Fixing tests for hint management.  Basically done - just need to change assertions
away from sql.