Split into two tests, as requested.