updates to tests to include removal of unneeded functions
updates to tests to include removal of unneeded functions

SCPR/kpcc_backroom_handshakes,SCPR/kpcc_backroom_handshakes,SCPR/kpcc_backroom_handshakes