Cleanup strings

Add tests