ENH: fixes for automated testing