Removed mockito, commented out test that uses it-- need Eclipse compatibility for grader