Fixed some broken tests and started clean integration test
Finished the integration test for clean