Fixed our unit tests; however, coverage keeps dropping for some godforsaken reason