Plumbing for testing with SICS rules along with minor cleanups