[OTF:1619] Resolved naming bug, fixed dependant tests and refined the TextResource query model.