A few more changes to deployment and comment out failing test