Fixed InternalSharding and refactorings

Refactored tests to use using() statements.
Fixed error in InternalSharding; the paths were wrong.