TRIVIAL fixing tests another attempt