some work on bug #32, corrections to tests