Getting tests passing again