Fix intermittend failure in unit tests
Minor improvements
Only generate delegate-to-supper methods for intercepted methods