small test improvments