Minor fixes, more test infrastructure.
Fixes and tests for Core\Str