Add final Unit tests including cycle length tests