cleanup view gen, make test generator