Updated unit tests and altered cycle generation to produce lists rather than editing a class variable. Improved speed further