Updated generators
More unit tests
Clean up tests