Fixed broken tests and decreased amount