various unittests fixes
aligned wizard to new fieldgroup design