Added tests for promotion/lift (some which fail), and small change for mgb