Make the manual test nicer and more useful

Change-Id: Iac5e8c32d8fa70664829ce5ded37fe3ff5ceb455
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>