Fixing a broken unit test :bowtie:
Fixing more unit tests :bowtie: