add XTest
Merge https://github.com/frankfx/master_thesis