Added additional feature tests