various testing modifications