#410 deleted unused class and corrected Tests