Increase unit tests coverage for Test\ to 99%, fix CS fixes, fix typos.