Clean up generator and test