Make test runnable in core
Cleanup sharding test
Updates on Randolph' sugegstions