I'm having the same issue deploying to TestNet. I get the message "The contract code couldn't be stored, please check your gas amount". Increasing gas doesn't seem to work, and if I increase it too much, exceed the max gas limit. Anyone find a solution this?