misc testing fixes