Improve unit test & Make manifest (#2071)

4 jobs for 2071 in 16 minutes and 46 seconds (queued for 9 minutes and 18 seconds)