Fixing and improving tests
[#74267992]

Signed-off-by: Johannes Tuchscherer <jtuchscherer@pivotallabs.com>