removed unused class, fixed test