Adding, but ignoring the Shen tests as they cannot run properly yet