Wait for secondary in replset-create test
Make sure to create db with sharding if required
Fix block wait time
Enable sharding in collection.create if needed
Make sure collection is created with sharding by default
Rename collection.shard_enabled to just "shard"