fixed it so that the *just after construction* passes 'correctly'. But merge test still failig, unrelated error causing that I guess, need to investigate.