Test planing and fix