modifications for solutions
Support for solutions and tests.