moved generator tests to fitting namespace
again, some fixes