Get rid off singleton (Connection)
Migrate to spring
Tests fix
Tests refactoring