Added Wizard, Test Management and some bug fixing