new feature support, more test functionality