ADding new qualifiers, and reflecting that in impl and test code