Tests too fragile. Maybe implement something like this latter.