Added other test code for shortcut version - renamed dte2 object - fixed TestSolution