Added tests for data listener