Adding additional unit-tests for the on-the-fly codes