bugs fixed in tests, elsewhere