Rename methods back to promotion/demotion and uncomment test