Weird string manipulation
Fix a bunch of tests