Fixed tests and changes item a bit