Add test targets, guard, new pods and etc.