Decoupled generators + tests
Added method to add algo