removed not needed variable
fixed test errors
fixed failing tests