Cleanup and small fixes/improvements in base/handler.
Fixing expected failure of an explicit model adapter - it works now :)