Update tests for multi-distro support