EventQueue removed duplication, added tests