Add nclient and further testing