Re-adding test cases

Apparently these additional test cases weren't in our SVN copy, re-adding.