diff --git a/test/testsuite/castortests/ns/chmod_invalidNumeric.input b/test/testsuite/castortests/ns/chmod_invalidNotOctal.input
similarity index 100%
rename from test/testsuite/castortests/ns/chmod_invalidNumeric.input
rename to test/testsuite/castortests/ns/chmod_invalidNotOctal.input
diff --git a/test/testsuite/castortests/ns/chmod_invalidNumeric.output0 b/test/testsuite/castortests/ns/chmod_invalidNotOctal.output0
similarity index 100%
rename from test/testsuite/castortests/ns/chmod_invalidNumeric.output0
rename to test/testsuite/castortests/ns/chmod_invalidNotOctal.output0
diff --git a/test/testsuite/castortests/ns/chmod_invalidNumeric.output1 b/test/testsuite/castortests/ns/chmod_invalidNotOctal.output1
similarity index 100%
rename from test/testsuite/castortests/ns/chmod_invalidNumeric.output1
rename to test/testsuite/castortests/ns/chmod_invalidNotOctal.output1
diff --git a/test/testsuite/castortests/ns/chmod_invalidNumericTooLong.input b/test/testsuite/castortests/ns/chmod_invalidNumericTooLong.input
new file mode 100644
index 0000000000000000000000000000000000000000..0ae106e01cda296b468596db5778298e32a4ab47
--- /dev/null
+++ b/test/testsuite/castortests/ns/chmod_invalidNumericTooLong.input
@@ -0,0 +1,2 @@
+umask 0022; nstouch <nsFile>; nschmod 12347777 <nsFile>; echo $?
+nsls -l <nsFile> | sed "s/  */ /g"
diff --git a/test/testsuite/castortests/ns/chmod_invalidNumericTooLong.output0 b/test/testsuite/castortests/ns/chmod_invalidNumericTooLong.output0
new file mode 100644
index 0000000000000000000000000000000000000000..c346e2ba9b2360561f87f4f4b5adcc509bde5ecb
--- /dev/null
+++ b/test/testsuite/castortests/ns/chmod_invalidNumericTooLong.output0
@@ -0,0 +1,2 @@
+invalid mode: 12347777
+1
diff --git a/test/testsuite/castortests/ns/chmod_invalidNumericTooLong.output1 b/test/testsuite/castortests/ns/chmod_invalidNumericTooLong.output1
new file mode 100644
index 0000000000000000000000000000000000000000..c73f9f7265c0cc9de12e3e31ddb5a9d57c3c488c
--- /dev/null
+++ b/test/testsuite/castortests/ns/chmod_invalidNumericTooLong.output1
@@ -0,0 +1 @@
+-rw-r--r-- 1 <userId> <groupId> 0 <month> <day> <time> <nsFile>
diff --git a/test/testsuite/castortests/ns/mkdir_invalidModeTooLong.input b/test/testsuite/castortests/ns/mkdir_invalidModeTooLong.input
index 8de0219549dac1b4284a4d7521dce7eecc7d6112..c1c331b3ab5243a17f053dc7d9841fe283e346a9 100644
--- a/test/testsuite/castortests/ns/mkdir_invalidModeTooLong.input
+++ b/test/testsuite/castortests/ns/mkdir_invalidModeTooLong.input
@@ -1,2 +1,2 @@
 nsmkdir --mode=777777777 <nsDir>; echo $?
-nsls -ld <nsDir> | sed "s/  */ /g"; echo $?
+nsls -ld <nsDir> | sed "s/  */ /g"
diff --git a/test/testsuite/castortests/ns/mkdir_invalidModeTooLong.output1 b/test/testsuite/castortests/ns/mkdir_invalidModeTooLong.output1
index a43110254f71eb561fca78ba19892f5deb80bbf3..ab3513e53d5856497a12fca3928b69c2ac0bcceb 100644
--- a/test/testsuite/castortests/ns/mkdir_invalidModeTooLong.output1
+++ b/test/testsuite/castortests/ns/mkdir_invalidModeTooLong.output1
@@ -1,2 +1 @@
 <nsDir>: No such file or directory
-1
diff --git a/test/testsuite/castortests/ns/mkdir_parent.input b/test/testsuite/castortests/ns/mkdir_parent.input
index c666b0a95b1cff2f52be119aaf04587838e1fba9..21fa0b3f4c68e04971be74aabdb37e740f0091f3 100644
--- a/test/testsuite/castortests/ns/mkdir_parent.input
+++ b/test/testsuite/castortests/ns/mkdir_parent.input
@@ -1,2 +1,2 @@
 umask 0472; nsmkdir -p <nsDir>/child; echo $?
-nsls -ld <nsDir> | sed "s/  */ /g"; echo $?
+nsls -ld <nsDir> | sed "s/  */ /g"
diff --git a/test/testsuite/castortests/ns/mkdir_parent.output1 b/test/testsuite/castortests/ns/mkdir_parent.output1
index 66679d64a30e1e4c85e83494581f290ba3907ddb..295d6815bc81fb5a65faee4899212d2c1e265bb8 100644
--- a/test/testsuite/castortests/ns/mkdir_parent.output1
+++ b/test/testsuite/castortests/ns/mkdir_parent.output1
@@ -1,2 +1 @@
 d-wx---r-x 1 <userId> <groupId> 0 <month> <day> <time> <nsDir>
-0
diff --git a/test/testsuite/castortests/ns/mkdir_parent0300.input b/test/testsuite/castortests/ns/mkdir_parent0300.input
index 7d09f2be9b61982caa7d5482bb889ae816f9db25..37151252153f9cfab60655083d02f606c5b51847 100644
--- a/test/testsuite/castortests/ns/mkdir_parent0300.input
+++ b/test/testsuite/castortests/ns/mkdir_parent0300.input
@@ -1,2 +1,2 @@
 umask 0555; nsmkdir -p <nsDir>/child; echo $?
-nsls -ld <nsDir> | sed "s/  */ /g"; echo $?
+nsls -ld <nsDir> | sed "s/  */ /g"
diff --git a/test/testsuite/castortests/ns/mkdir_parent0300.output1 b/test/testsuite/castortests/ns/mkdir_parent0300.output1
index 425cb62889c3e18549ca63aed10135302d9a91dc..7693f1a014f151e906a3df38c2e0cfdc9a7e2828 100644
--- a/test/testsuite/castortests/ns/mkdir_parent0300.output1
+++ b/test/testsuite/castortests/ns/mkdir_parent0300.output1
@@ -1,2 +1 @@
 d-wx-w--w- 1 <userId> <groupId> 0 <month> <day> <time> <nsDir>
-0
diff --git a/test/testsuite/castortests/ns/mkdir_specificMode.input b/test/testsuite/castortests/ns/mkdir_specificMode.input
index 422f25441d730d1db0f6c706875a3ee9bbe46a09..1aa61c3cc0cd45e482d0bf98511b1829d6dc378c 100644
--- a/test/testsuite/castortests/ns/mkdir_specificMode.input
+++ b/test/testsuite/castortests/ns/mkdir_specificMode.input
@@ -1,2 +1,2 @@
 nsmkdir --mode=555 <nsDir>; echo $?
-nsls -ld <nsDir> | sed "s/  */ /g"; echo $?
+nsls -ld <nsDir> | sed "s/  */ /g"
diff --git a/test/testsuite/castortests/ns/mkdir_specificMode.output1 b/test/testsuite/castortests/ns/mkdir_specificMode.output1
index c4d8299e1a1aa092d32d648ba3ed6b0ccef72fbe..53f5711481e5b0dd3408d123cd2ebff6b5aeb877 100644
--- a/test/testsuite/castortests/ns/mkdir_specificMode.output1
+++ b/test/testsuite/castortests/ns/mkdir_specificMode.output1
@@ -1,2 +1 @@
 dr-xr-xr-x 0 <userId> <groupId> 0 <month> <day> <time> <nsDir>
-0