Fixed core tests
Updated listener
Added new test notes