Finish critical-path and tests