Some cleanup
Added tests for text properties