Addition of week03 test & reorganization