Since we now have quite a few "special" test wrappers, I took the opportunity to refactor the code and add a couple of testcases too. Change-Id: I20e1214351d71c1474be32f03d4218ae6bdd2277 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io>