Surround with tests now includes formatting. Testdata fixed.