couple of fixes around testing blocks