Fixed generator generation, added basic smoke test