Added tests for generator solution

Fix for #2