New patch. Now with 3 test cases!

-Dale