Tests fixed and tagging tests added

Signed-off-by: Andre Fuechsel <a.fuechsel@telekom.de>