Fixes to overload test - still not fully working