More tests. Need to test the generator function proper and move the older implementation of the problems to the newer implementation.