Update sln file along with fixing more tests