Fix bugs introduced in tests by other updates on this branch (#7)