Merge "Few updates for baremtal dependent tests"