Refactor testcases.

Signed-off-by: Rahul Sahu <Rahul.Sahu@tomtom.com>