rewrote some feature tests