Fixes more string splitting errors

Also comments out a to-be-fixed test