Refactoring (WIP)
Increase time of connection check
Start testing
Fix spec