Handle Roslyn API changes in latest master
Ups
Minor restructuring, removed not-relevant test.