Changed Wizard class accessibility to package only level and added few unit tests