--- a/test/octave.test/arith/acot-1.m
+++ b/test/octave.test/arith/acot-1.m
@@ -1,6 +1,6 @@
 rt2 = sqrt (2);
 rt3 = sqrt (3);
-v = [pi/6, pi/4, pi/3, pi/2, -pi/3, -pi/4, -pi/6];
+v = [pi/6, pi/4, pi/3, pi/2, 2*pi/3, 3*pi/4, 5*pi/6];
 x = [rt3, 1, rt3/3, 0, -rt3/3, -1, -rt3];
 all (abs (acot (x) - v) < sqrt (eps))
 

--- a/test/octave.test/arith/exp-1.m
+++ b/test/octave.test/arith/exp-1.m
@@ -1,1 +1,1 @@
-all (exp ([0, 1, -1, 1000, -1000]) == [1, e, 1/e, Inf, 0])
+all (exp ([0, 1, -1, -1000]) - [1, e, 1/e, 0] < sqrt (eps))

--- a/test/octave.test/arith/sqrt-1.m
+++ b/test/octave.test/arith/sqrt-1.m
@@ -1,1 +1,2 @@
-sqrt (4) == 2 && sqrt (-1) == i && sqrt (1+i) == exp (0.5 * log (1+i))
+(sqrt (4) == 2 && sqrt (-1) == i
+ && abs (sqrt (1+i) - exp (0.5 * log (1+i))) < sqrt (eps))

--- a/test/octave.test/arith/sqrt-2.m
+++ b/test/octave.test/arith/sqrt-2.m
@@ -1,3 +1,3 @@
 all (all (abs (sqrt ([4, -4; i, 1-i])
-	       - [2, -2i; exp (0.5 * log (i)), exp (0.5 * log (1-i))]))
-	  < sqrt (eps))
+	       - [2, -2i; exp (0.5 * log (i)), exp (0.5 * log (1-i))])
+	  < sqrt (eps)))

--- a/test/octave.test/linalg/qr-1.m
+++ b/test/octave.test/linalg/qr-1.m
@@ -1,3 +1,10 @@
-[q, r] = qr ([0, 2, 1; 2, 1, 2])
-(abs (q - [0, -1; -1, 0] < sqrt (eps))
- && abs (r - [-2, -1, -2; 0, -2, -1] < sqrt (eps)))
\ No newline at end of file
+a = [0, 2, 1; 2, 1, 2];
+
+[q, r] = qr (a);
+
+[qe, re] = qr (a, 0);
+
+(size (q) == [2, 2] && size (r) == [2, 3]
+ && abs (q * r - a) < sqrt (eps)
+ && size (qe) == [2, 2] && size (re) == [2, 3]
+ && abs (qe * re - a) < sqrt (eps))

--- a/test/octave.test/linalg/qr-2.m
+++ b/test/octave.test/linalg/qr-2.m
@@ -1,4 +1,10 @@
 a = [0, 2, 1; 2, 1, 2];
-[q, r, p] = qr (a);
+
+[q, r, p] = qr (a);  # not giving right dimensions. XXX FIXME XXX
+
+[qe, re, pe] = qr (a, 0);
+
 (size (q) == [2, 2] && size (r) == [2, 3] && size (p) == [3, 3]
- && abs (a * p - q * r) < sqrt (eps))
+ && abs (q * r - a * p) < sqrt (eps)
+ && size (qe) == [2, 2] && size (re) == [2, 3] && size (pe) == [1, 3]
+ && abs (qe * re - a(:,pe)) < sqrt (eps))

--- a/test/octave.test/linalg/qr-3.m
+++ b/test/octave.test/linalg/qr-3.m
@@ -1,4 +1,10 @@
 a = [0, 2; 2, 1; 1, 2];
-[q, r, p] = qr (a);
-(size (q) == [3, 3] && size (r) == [3, 2] && size (p) == [2, 2]
- && abs (a - q * r * p) < sqrt (eps))
+
+[q, r] = qr (a);
+
+[qe, re] = qr (a, 0);
+
+(size (q) == [3, 3] && size (r) == [3, 2]
+ && abs (a - q * r) < sqrt (eps)
+ && size (qe) == [3, 2] && size (re) == [2, 2]
+ && abs (a - qe * re) < sqrt (eps))

--- a/test/octave.test/linalg/qr-4.m
+++ b/test/octave.test/linalg/qr-4.m
@@ -1,4 +1,10 @@
 a = [0, 2; 2, 1; 1, 2];
-[q, r, p] = qr (a, 0);
-(size (q) == [3, 2] && size (r) == [2, 2] && size (p) == [1, 2]
- && abs (a (:, p) - q * r) < sqrt (eps))
+
+[q, r, p] = qr (a);
+
+[qe, re, pe] = qr (a, 0);
+
+(size (q) == [3, 3] && size (r) == [3, 2] && size (p) == [2, 2]
+ && abs (a * p - q * r) < sqrt (eps)
+ && size (qe) == [3, 2] && size (re) == [2, 2] && size (pe) == [1, 2]
+ && abs (a(:,pe) - qe * re) < sqrt (eps))

--- a/test/octave.test/poly/polyfit-2.m
+++ b/test/octave.test/poly/polyfit-2.m
@@ -1,2 +1,2 @@
 x = [-2, -1, 0, 1, 2];
-all (all (polyfit (x, x.^2+x+1, 3) - [0; 1; 1; 1] < 8*eps))
+all (all (abs (polyfit (x, x.^2+x+1, 3) - [0; 1; 1; 1]) < 8*eps))

--- a/test/octave.test/system/strftime-1.m
+++ b/test/octave.test/system/strftime-1.m
@@ -1,2 +1,5 @@
-fmt = "%%%n%t%H%I%k%l%M%p%r%R%s%S%T%X%Z%a%A%b%B%c%C%d%e%D%h%j%m%U%w%W%x%y%Y";
-isstr (strftime (fmt, localtime (time ())))
\ No newline at end of file
+(isstr (strftime ("%%%n%t%H%I%k%l", localtime (time ())))
+ && isstr (strftime ("%M%p%r%R%s%S%T", localtime (time ())))
+ && isstr (strftime ("%X%Z%a%A%b%B%c", localtime (time ())))
+ && isstr (strftime ("%C%d%e%D%h%j%m", localtime (time ())))
+ && isstr (strftime ("%U%w%W%x%y%Y", localtime (time ()))))