Merge "Re-structured keystore test-utils module." into main