added more tests. fixed issues from event changes (there's most definitely still issues related to that)