Cleanup

Setup missing testcases for surrounding.
Removing output.