More tests.
Test improvements.
Added ordering in case tests are executed against clusters.