Another batch of improved test assertions