Removed connect (shouldn't be needed), added fallback method, tests

and also fixes #6