Fixing missing expected data. Fixing command calls.