Edit dropdown tests fixes