Add additional feature tests