Fix to get tests passing again