Fleshing out with more tests