Add back in lms and cms test suites