get more promotion tests going and fix issues found
fix refactoring error