Merge changes I5d84e3c9,Ia945cb55 into main

* changes:
  Update tests
  Fix constructor check