some last minute tweaks to testing