Separate instance-settings from instances
Remove test pin