finished Event / fixed tests