additional test improvments