Added a simple string interpolation test, removed some unused code