Fixed test typos/issues