Added connector support
Test cleanup