split tests as they were taking too long on castan and hitting timeout of 60, increased time out to 120 as well
