Updated: Includes tests (after generator fix)