Beefing up test cases.