updated feature and integration tests