.Net Client refactor tests