Promotions tests, API URL change, bug fix
Merge branch 'promotions' into dev