Added events test and @attribute tests