Cascading dropdown fixes, updated test fixtures