Fix the new implementation of the connection
Remove testing