Adds util for classes and test for events