finish converting to MSTest