Reduce gems
Fix broken tests