Added client info to listeners

Added client info to listeners and removed unneeded test files.