Beginning to migrate from testcode to full code for non-redundant specification