Merge "Improved virtual container tests." into pi-dev