Changes for using active shards only. Does not yet contain changes to any Tests.