Reactivates & extends WebTests and fixes sf 2.6 compatibility issues