Let's get these tests passing again