[test] Minor Changes
[misc] Carrying changes over from bg1