Created some more test cases and relocated them

This is just for the record. r+, r=me.