Put back some test code