fixed Test.t
disabled eventModel.t until finished fixing it