Renaming and cleaning up for tests-always-included