Fix tests

Tests needed to be fixed again. :hamster: