Merge changes I50e3a5e1,Icd043916 into main

* changes:
  Remove use of legacy layers from TransactionApplicationTest
  Remove use of legacy layers from composition test