NshTests refactored