Could this be split into two tests?