Improved testsuite

It should cover bnc#865199