fixes to keys in tests