Merge "Remove few refercences left to tempest-lib"