Get tests passing again