Ditch wierdo substr for slice, and tests for break statements