Adding back in platform and package and removing darwin specific expect command
Fixing merge conflicts adding back in package