Handle signals better
Use test-driver when asked