some small test improvements ... strange they failed here, however