Adding tests for substring etc.