Fix string variable bug
Reformatted implementation code and fix test file location.
Revert "Fix the test failures"

This reverts commit fffd026559eff0b93b7058ee51b1dc2d3fa0cca0.
Merge branch 'reformat'