Made test more explicit
Fixed typo
Updated to support build 20515