More focused/complete tests