test improvemnts