Optimized generating changes, more unit tests.