Added prefs for test and keystore