Doing more work on unit tests, adding IEC model