oops fix tests as well