kylekatarnls Fix unit tests