Fixed some inputs,add diff types of plans tests