Adding tests and filling out the generator