fixup! Reworking unit tests