changes around using Tarql tool. Some tests added.