Cleaned up a test case; removed unused code