Tests working and speeded up apart from first initial call.