Instance test fixed and improved