Add some feature tests