Updated files to support Phoenix v0.5.0.  Cleaned up test code.