Updated with SP1 and Test Plan submission