Split out the slow parts of some tests

Into manual tests, because we want the base test run much quicker (all unit tests now finish in 92 seconds on my machine, vs. over 17 minutes).