Add extended tests