Cleanup
Add invisible space cleanup and fix some tests