fix tests; now all passing; phew
gs