- added a "wait for green" for some test on unmapped indices
- cleanup