Installation and tests fixes