fixed results test, event methods refactoring