Fix for keystore generation from tests