Updates to and discovered in tests