Few minor changes and fix of requesting test