Improve bag tests