Remove commented code, add better test case