Revert "tests removed from sln"

This reverts commit 7bd1e862fbbe8c45a8b0175d651522dc105ba715.
Revert "removed tests"

This reverts commit 07c5d898b45f23bae85177a97da72fbb26304bc1.
major cleanup