clean and modify test classes for hd3 and settings
clean and modify test classes for hd3 and settings