now fixing tests as well