Fixed SPDPListener and useTests