Updates to test_ls2 to match refactored code.