Cleaned up test case, removed unused methods.