Get tests running again, save externs to separate files