Minor fixes

1. Fixed solution file to support package restoring
2. Replaced similar tests with test cases