Removed commented out test cases