EAGLESIX-3003: Cleaned up test cases and some of hte code on the class.