Clean up lamp test code