Add namespace, add OCMock, implement listeners and add test