fixing bugs found in 05/06 tests