test(*): #867 - unit tests should be passing again

TODO: Make these tests better and write new ones