splitting causes jobs to run in different directories which is not what we want so back to one job and extending the timeout

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