Hopefully fix tests