fixed add and remove eventlisteners

jira issue: WP-1085
Merge pull request #17 from krishnabangalore/WP-1085_addListener

fixed add and remove eventlisteners
added add and remove listener tests timeout fails

jira issue: WP-1099
Merge pull request #18 from krishnabangalore/WP-1099_VehicleTest

added add and remove listener tests timeout fails
wrt file changes with ref to Andreas pull request 1308

jira issue: WP-1308
Merge pull request #19 from krishnabangalore/WP-1085_addListener

wrt file changes with ref to Andreas pull request 1308