Fixing NshTest errors