Cleanup temporary test files

A properly defined test should correctly cleanup after itself when the
tests have completed execution.

Change-Id: I9887558e698a2ee823a9f91727cde5eccc2348f2
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Fix expression deprecated warning on ${version}

${version} is deprecated and ${project.version} should be used instead.
This patch fixes the expression used.

Change-Id: Iaf3a3bf8b852836ed01106a419cca2ab60c314d5
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Merge "Fix expression deprecated warning on ${version}"