More testing facilitation fixes.