Fixed tests so that they are up to date with current code. They all now

pass. Committed by irshusdock, cgmcandrews