More renaming
Include all tests in the suite now.