Adding glider and current generation
Fixing Tests