Adapt tests to change in trackable image size (x2)

Also cleanup the test code to use AssertJ assertions.
Merge branch 'release' into upstream