Refactored test cases into model directory
Added support directory.

This is for solution code and other support files needed in testing.
Fixed error from incomplete string formatting.