Solved error in test + removed unused vars