[OE-3377] - included available scope and related unit tests