Fixed tests finally. Shoot me if I have to do that again.