fixed event views
some more tests are pending now :/