Fixed string dependencies, removed testing code