Some more install/test tweaking