Adding more tests and a 'generate' method