Slightly more complete tests