Make other tests work with the current code