fixed majority of integration tests... two tests are still broken:(