tests improved a bit