Add tests for surrounding whitespace