Add more tests and supporting files
Add final touches and cleanup on disconnect handler