Lots of testing updates