Phoenix 10

Added new testcases to ensure things work.  Mostly followed what James had said in the comments.