Added phantom tests for integration.
Cleaned up generated stuff