Slight mods to tests