SZ-111: a bit of cleanup in TestApp