Fixed up tests
Fixed web test