Added new test and some debug line in generator.