separating the keystone tests