Add more testing infrastructure