fixed errors
fixed failing tests