Defer custom layout insertion to drop report generation time over 50%
Add support for running individual unit tests