Test addition, shutdown hooks creation