Fix logging
Add a couple local tests for convenience
Cleanup data on restart of FSM