Tests streamlined