LPS-47041 Fix tests
LPS-47071 Do manual clean up whenever possible
LPS-45606 SF
LPS-46686 SF