Added Str helper and updated unit test