Separate core test variables from core