improved integration tests so they don't interact negatively