Moved some test to integration tests
Added IntegrationTests