Updated vs solution parsing, fixed some issues. Also fixed some issues with corresponding unit tests.