lots of test improvments