Update JUnit Testing for EventLogger and SystemTesting