refactored connection, improve specs