Fixed adding of ComplexData Strings
Cleaned up imports
Added tests