Small cleanup

Added unit test for null trigger to StateBase
Standardized a few toString formats