Fixed not yielding matches plus text tests