update for v5.1; more tests