Minor fixes to testing and support files