PLT-451 - Remove use of convention and security source

Fixed tests
PLT-451 - Remove use of convention and security source

Address review comments