fixing up tests after removing construct package