Modified HD3 class and test