A bit more AV; fixed alice and bob tests.