extend wizard tests, adjustments