Adding unit tests for textfiles and fixed around string code