Add moar test cases