Refinement and improvement of the setup view, correcting the tests