TST : simplified tests

Use generator tests where possible