inserted solution to concatonate test.ops and test.construction as an alternative to .combine_first.  Adjusted setup_frame accordingly.