Move a negative test to a group of negative tests
Make debug logging conditional and turn it off
Unhardcode index
Singularize units
Remove dead code
Add a couple more tests for FSM search