Since system tests are slow, and these tests were almost identical, we're merging them into one to make them faster.