Work on Solution, including new setup and tests