A Bucket of test bugfixes and maintenance updates