fix ms test project. add unit tests