changes in tests to accomodate minor interfacial changes