Improved tests to catch issues with asset tags and more configurations