downgrade and add test