Fixed Ls test setup and cleanup phases