Fix Suite Default Naming and Add Test