Fixed test cases and appropriate classes to work correctly

Change-Id: Ib55ae52795f4ff1b20598a0757b1ab5d047ddc98
Signed-off-by: Johannes Wendel <johannes.wendel@iese.fraunhofer.de>
9 files changed