Cleaned up test cases, corrected an error, test cases not yet passing.