Final test install bug fixes and modifications