WebtestFix Further Enhancements