Adding tests for generation skipping issue
Fixed issue when blocks or macros skip a generation