more promotion tests/fixes