Made integration tests headless. Code cleanup.
27 files changed