About time I finished this. Switching to my desktop.
Fixed failing test.