new and improved acceptance/func tests