Add more testing support.