Fleshing out the test cases more.