Fix test failures

Merged in the changes from @viveksjain and fixed any test failures that came up.
Longer strings are now handled by overflowing rather than chopping them off. Sometimes I like to know the full file path.