Updated test case, removed some redundant code