Remove some non-working code, update property names and add missing
import statement.
Add a manual test.

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