Update report, add some test plans, fix up formatting