A couple unit tests for IS4C and minor bugfixes they found