Updating unit tests and prototype connector