Finished connector and Unit Test changes